Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java patches rebase #4716

Merged
merged 4 commits into from
Mar 5, 2020
Merged

Java patches rebase #4716

merged 4 commits into from
Mar 5, 2020

Conversation

bridiver
Copy link
Collaborator

@bridiver bridiver commented Feb 21, 2020

Resolves brave/brave-browser#8557

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@bridiver bridiver self-assigned this Feb 21, 2020
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing these

+ chain = org.brave.bytecode.BraveClassAdapter.createAdapter(chain);
reader.accept(chain, 0);
byte[] patchedByteCode = writer.toByteArray();
+
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also removing these empty lines added

@SergeyZhukovsky
Copy link
Member

We will need to describe how to create such patches in wiki

@bridiver bridiver added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Mar 2, 2020
Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@bridiver bridiver merged commit ab214f0 into master Mar 5, 2020
@bridiver bridiver deleted the java-patches-rebase branch March 5, 2020 21:23
@bsclifton bsclifton added this to the 1.7.x - Nightly milestone Mar 5, 2020
@bsclifton
Copy link
Member

bsclifton commented Mar 5, 2020

Updated this PR and the issue to set 1.7 milestone (current master)

brave-builds pushed a commit that referenced this pull request Mar 10, 2020
brave-builds pushed a commit that referenced this pull request Mar 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Android] use asm to avoid patching java classes
3 participants